Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crud-Location and relation #37

Merged
merged 9 commits into from
Feb 29, 2024
Merged

crud-Location and relation #37

merged 9 commits into from
Feb 29, 2024

Conversation

globox97
Copy link
Contributor

Creation of the class with relation to the Shelter class

elskater98
elskater98 previously approved these changes Feb 28, 2024
# Conflicts:
#	src/main/java/cat/udl/eps/softarch/demo/domain/Location.java
@elskater98
Copy link
Contributor

In order to fix the conflicts, you should merge "main" into "your_branch", fix the conflicts and push the code again.

@elskater98 elskater98 merged commit 99a1cd2 into main Feb 29, 2024
1 check passed
@elskater98
Copy link
Contributor

Well done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants